From: kaf24@scramble.cl.cam.ac.uk Date: Sun, 13 Mar 2005 09:39:14 +0000 (+0000) Subject: bitkeeper revision 1.1236.28.1 (42340a42zVMF1dHpLj0Rzok7P9t48Q) X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17857^2~26^2~5^2~2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=5f53c9cfb806550887ac8f510d0e21d1bb3bbe9f;p=xen.git bitkeeper revision 1.1236.28.1 (42340a42zVMF1dHpLj0Rzok7P9t48Q) Manual merge. Signed-off-by: Keir Fraser --- 5f53c9cfb806550887ac8f510d0e21d1bb3bbe9f diff --cc tools/python/xen/xend/server/SrvDaemon.py index 117ae2a973,9bf5fd9bb0..2ca8f38f99 --- a/tools/python/xen/xend/server/SrvDaemon.py +++ b/tools/python/xen/xend/server/SrvDaemon.py @@@ -622,12 -620,13 +622,14 @@@ class Daemon self.domainCF = domain.DomainControllerFactory() self.blkifCF = blkif.BlkifControllerFactory() self.netifCF = netif.NetifControllerFactory() + self.usbifCF = usbif.UsbifControllerFactory() self.consoleCF = console.ConsoleControllerFactory() - def listenEvent(self): + def listenEvent(self, xroot): protocol = EventFactory(self) - return reactor.listenTCP(EVENT_PORT, protocol) + port = xroot.get_xend_event_port() + interface = xroot.get_xend_address() + return reactor.listenTCP(port, protocol, interface=interface) def listenNotifier(self): protocol = NotifierProtocol(self.channelF)